From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Tue, 20 Feb 2018 17:07:51 +0000 (+0000)
Subject: Merge "mw.loader: Document mw.loader.require() as private"
X-Git-Tag: 1.31.0-rc.0~566
X-Git-Url: http://git.cyclocoop.org//%22http:/%22.attribut_html%28%24lesurls%5B%24numero%5D%29.%22/%22?a=commitdiff_plain;h=dc06d553be36318b88caf7837a39c41b97364dea;hp=2b11f88e250156f105338f5a8876133f55b2d831;p=lhc%2Fweb%2Fwiklou.git

Merge "mw.loader: Document mw.loader.require() as private"
---

diff --git a/resources/src/mediawiki/mediawiki.js b/resources/src/mediawiki/mediawiki.js
index e9efc1668f..a2e071e11a 100644
--- a/resources/src/mediawiki/mediawiki.js
+++ b/resources/src/mediawiki/mediawiki.js
@@ -1982,6 +1982,12 @@
 				 *         OO.compare( [ 1 ], [ 1 ] );
 				 *     } );
 				 *
+				 * Example of inline dependency obtained via `require()`:
+				 *
+				 *     mw.loader.using( [ 'mediawiki.util' ], function ( require ) {
+				 *         var util = require( 'mediawiki.util' );
+				 *     } );
+				 *
 				 * Since MediaWiki 1.23 this also returns a promise.
 				 *
 				 * Since MediaWiki 1.28 the promise is resolved with a `require` function.
@@ -2154,9 +2160,14 @@
 				/**
 				 * Get the exported value of a module.
 				 *
-				 * Modules may provide this via their local `module.exports`.
+				 * This static method is publicly exposed for debugging purposes
+				 * only and must not be used in production code. In production code,
+				 * please use the dynamically provided `require()` function instead.
 				 *
-				 * @protected
+				 * In case of lazy-loaded modules via mw.loader#using(), the returned
+				 * Promise provides the function, see #using() for examples.
+				 *
+				 * @private
 				 * @since 1.27
 				 * @param {string} moduleName Module name
 				 * @return {Mixed} Exported value